Merge version 3.6.3-2+rpi1 and 3.8-2 to produce 3.8-2+rpi1

diff --cc debian/changelog
index 408fb4cabdb5f1680627f674f21f1659a09871b8,abb17da4a120c9bf2a0645b7f23ff9bbaf11666e..3fab45f2882e3995111043dc629d63bf221a2f79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,29 @@@
- poedit (3.6.3-2+rpi1) trixie-staging; urgency=medium
++poedit (3.8-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 01 May 2022 11:16:49 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jul 2025 17:01:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Jan 2026 02:12:01 +0000
++
+ poedit (3.8-2) unstable; urgency=medium
+ 
+   * Switch to nlohmann3.12
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 04 Nov 2025 14:27:32 +0100
+ 
+ poedit (3.8-1) unstable; urgency=medium
+ 
+   * New upstream version 3.8
+   * Update copyright file
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 16 Oct 2025 13:50:27 +0200
+ 
+ poedit (3.7-1) unstable; urgency=medium
+ 
+   * New upstream version 3.7
+   * Refresh patch
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 20 Aug 2025 23:55:23 +0200
  
  poedit (3.6.3-2) unstable; urgency=medium